merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 28 Oct 2010 10:57:59 +0000 (19:57 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 28 Oct 2010 10:57:59 +0000 (19:57 +0900)

Trivial merge